From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 18 Mar 2007 08:06:57 +0000 (+0000)
Subject: (redisplay_internal, note_mouse_highlight): Check
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~1540
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3a2d86f0ca5f95807980b2e598dcba3d18f26288;p=emacs.git

(redisplay_internal, note_mouse_highlight): Check
popup_activated for MAC_OS.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 544043f2747..c02a43d9a0c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10872,7 +10872,7 @@ redisplay_internal (preserve_echo_area)
 	return;
     }
 
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif
@@ -22672,7 +22672,7 @@ note_mouse_highlight (f, x, y)
   struct buffer *b;
 
   /* When a menu is active, don't highlight because this looks odd.  */
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS)
   if (popup_activated ())
     return;
 #endif